auto upstream
authorJoakim Verona <joakim@verona.se>
Sun, 23 Dec 2012 17:26:43 +0000 (18:26 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 23 Dec 2012 17:26:43 +0000 (18:26 +0100)

Trivial merge